Merge 2012-04-09 GnuTLS fix from trunk
authorChong Yidong <cyd@gnu.org>
Tue, 10 Apr 2012 08:00:43 +0000 (16:00 +0800)
committerChong Yidong <cyd@gnu.org>
Tue, 10 Apr 2012 08:00:43 +0000 (16:00 +0800)

Trivial merge